Rearrange includes. inspired by, but not executed by, https://code.google.com/p...

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4381 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/arcdist.cc b/gpsbabel/arcdist.cc
index f622033ad463ebc10330d7841cd11778a1e14761..b2812494fed04bbc8f7b281b0f1362f155a13a6b 100644 (file)
--- a/gpsbabel/arcdist.cc
+++ b/gpsbabel/arcdist.cc
@@ -18,6 +18,9 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
+
+#include <math.h>
+
 #include "defs.h"
 #include "filterdefs.h"
 #include "grtcirc.h"

diff --git a/gpsbabel/axim_gpb.cc b/gpsbabel/axim_gpb.cc
index 97fcf4bd86ce95b029ff2dc02aca41eb5b5d8ff3..424fc141db6cac2471c9be7d2ae306cc3d1d762c 100644 (file)
--- a/gpsbabel/axim_gpb.cc
+++ b/gpsbabel/axim_gpb.cc
@@ -20,11 +20,13 @@
 
  */
 
-#include "defs.h"
 #include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "defs.h"
+
 #define MYNAME "axim_gpb"
 
 #define RECORD_LEN     344

diff --git a/gpsbabel/compegps.cc b/gpsbabel/compegps.cc
index 093b818daac9cffd4de90d3465a3c682fff87f35..b078acbb7b55b6a04712a7c24ec5083c9eb4b5b9 100644 (file)
--- a/gpsbabel/compegps.cc
+++ b/gpsbabel/compegps.cc
@@ -61,6 +61,7 @@
 
 #if CSVFMTS_ENABLED
 #include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 9c672699b7ed00cf84907dbf08c70042aa540236..77d0ef73fdc10eb7fce048ce198c02b42bcfde5c 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -18,13 +18,6 @@
  */
 #ifndef gpsbabel_defs_h_included
 #define gpsbabel_defs_h_included
-#include <time.h>
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stddef.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/gpsbabel/destinator.cc b/gpsbabel/destinator.cc
index e8f63d22248cb181f026889e8048220610eeaa42..1de34ea3defa4162b5aa6804a79e316165bbc582 100644 (file)
--- a/gpsbabel/destinator.cc
+++ b/gpsbabel/destinator.cc
@@ -22,13 +22,15 @@
 
  */
 
+#include <ctype.h>
+#include <math.h>
+#include <time.h>
+
 #include "defs.h"
 #include "cet.h"
 #include "cet_util.h"
 #include "garmin_fs.h"
 #include "strptime.h"
-#include <ctype.h>
-#include <time.h>
 
 #define MYNAME                 "destinator"
 #define DST_DYN_POI    "Dynamic POI"

diff --git a/gpsbabel/enigma.cc b/gpsbabel/enigma.cc
index b82dd9a5370c992da343fbf9721d2070ec2e2693..a2b4dcbdc73025096d591ee81ccd819d271c83dc 100644 (file)
--- a/gpsbabel/enigma.cc
+++ b/gpsbabel/enigma.cc
@@ -21,6 +21,8 @@
 
  */
 
+#include <math.h>
+
 #include "defs.h"
 
 #define MYNAME "Enigma binary route and waypoint file format"

diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc
index 151dc6752be82f20f5c3dbf35bb8624a53e3249e..c865171f64b3a374ad33a9575ab0987c07dd1f06 100644 (file)
--- a/gpsbabel/garmin.cc
+++ b/gpsbabel/garmin.cc
@@ -21,6 +21,8 @@
 
 #include <ctype.h>
 #include <limits.h>
+#include <math.h>
+
 #include "defs.h"
 #include "grtcirc.h"
 #include "jeeps/gps.h"

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index 562598d61c87db279d78e8470945c60315f7f29c..3d679b826a33fce26739cf5c94b32f2d1bcc4532 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -63,9 +63,10 @@
            2008/09/11: Make format 'pipeable' (cached writes using gbfile memapi)
 */
 
+#include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <time.h>
 
 #include "defs.h"

diff --git a/gpsbabel/ggv_log.cc b/gpsbabel/ggv_log.cc
index ece06c5678a2689a9948641cfdae2632469c48ac..5994bb6c118d8abe57c6ba015ab6a07fa85166b4 100644 (file)
--- a/gpsbabel/ggv_log.cc
+++ b/gpsbabel/ggv_log.cc
@@ -21,6 +21,7 @@
  */
 
 #include <ctype.h>
+#include <math.h>
 #include <time.h>
 
 #include "defs.h"

diff --git a/gpsbabel/ggv_ovl.cc b/gpsbabel/ggv_ovl.cc
index 43a293d70c9745f1bf2a1a0609f03f46652b772d..9ef4e1ca37fa486fbbd2331074d9c7a9651c5059 100644 (file)
--- a/gpsbabel/ggv_ovl.cc
+++ b/gpsbabel/ggv_ovl.cc
@@ -21,6 +21,7 @@
  */
 
 #include <ctype.h>
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/gpsbabel/gpssim.cc b/gpsbabel/gpssim.cc
index 83482989dddfc62b16237508766223de6df2d71f..79b4943e1c181e4015f60f1bfb9860215ddbcf43 100644 (file)
--- a/gpsbabel/gpssim.cc
+++ b/gpsbabel/gpssim.cc
@@ -19,6 +19,8 @@
 
  */
 
+#include <math.h>
+
 #include "defs.h"
 
 #define MYNAME "gpssim"

diff --git a/gpsbabel/gpsutil.cc b/gpsbabel/gpsutil.cc
index 283d970dcc7746c37be4cdaab547a610207a4cf4..b1c41445fb203bf2c8365a2dfc6b9f476b725cb3 100644 (file)
--- a/gpsbabel/gpsutil.cc
+++ b/gpsbabel/gpsutil.cc
@@ -18,6 +18,9 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
+
+#include <math.h>
+
 #include "defs.h"
 #include "magellan.h"
 

diff --git a/gpsbabel/grtcirc.cc b/gpsbabel/grtcirc.cc
index 8e98d204ea8afd6d992c0e5c750d22a9d700f958..c970dddf65f80d17d1b7bec0eae4d525c20ef9fe 100644 (file)
--- a/gpsbabel/grtcirc.cc
+++ b/gpsbabel/grtcirc.cc
@@ -18,8 +18,11 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
+
 #include <errno.h>
+#include <math.h>
 #include <stdio.h>
+
 #include "defs.h"
 #include "grtcirc.h"
 

diff --git a/gpsbabel/height.cc b/gpsbabel/height.cc
index ba779595f69e1f0dc7123bf9afc447816c61841f..a8b471402d0a366f06f3783558c5f489544e1a2c 100644 (file)
--- a/gpsbabel/height.cc
+++ b/gpsbabel/height.cc
@@ -21,6 +21,8 @@
 
  */
 
+#include <math.h>
+
 #include "defs.h"
 #include "filterdefs.h"
 

diff --git a/gpsbabel/igc.cc b/gpsbabel/igc.cc
index f6aee33840fcc7649cab344b1856224d8516af4b..6357e22de8618d51e17c2faa8fe61ba5c7282d8e 100644 (file)
--- a/gpsbabel/igc.cc
+++ b/gpsbabel/igc.cc
@@ -23,8 +23,10 @@
  * 59 Temple Place - Suite 330, Boston, MA 02111 USA
  */
 
-#include "defs.h"
 #include <errno.h>
+#include <math.h>
+
+#include "defs.h"
 
 static gbfile* file_in, *file_out;
 static char manufacturer[4];

diff --git a/gpsbabel/jtr.cc b/gpsbabel/jtr.cc
index dbeff1bc6b6d05a8db776186f6d9cb4b8169a994..76bd3be099b4c5e03a68fa3d847c574d1f59ac36 100644 (file)
--- a/gpsbabel/jtr.cc
+++ b/gpsbabel/jtr.cc
@@ -21,9 +21,11 @@
  */
 
 #include <ctype.h>
-#include <time.h>
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
+
 #include "defs.h"
 #include "csv_util.h"
 #include "avltree.h"

diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index 62c9c5be965b9fb2404348e3ba48f64891c3ee4c..35df16c3133396668cd9e2627abc806892943879 100644 (file)
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -20,16 +20,18 @@
        Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
-#include "defs.h"
-#include "xmlgeneric.h"
-#include "grtcirc.h"
+#include <math.h>
+#include <QtCore/QRegExp>
 
 #ifdef __WIN32__
 # include <windows.h>
 #endif
 
+#include "defs.h"
+#include "xmlgeneric.h"
+#include "grtcirc.h"
+
 #include "src/core/xmlstreamwriter.h"
-#include <QtCore/QRegExp>
 
 // options
 static char* opt_deficon = NULL;

diff --git a/gpsbabel/maggeo.cc b/gpsbabel/maggeo.cc
index 1eecc0c10f05f361dcf392d0ddd0e3e40cae9082..996ad151666d651a7a9c21e90e2d8b024172025b 100644 (file)
--- a/gpsbabel/maggeo.cc
+++ b/gpsbabel/maggeo.cc
@@ -20,6 +20,8 @@
  */
 
 #include <ctype.h>
+#include <math.h>
+
 #include "defs.h"
 #include "csv_util.h"
 #include "xmlgeneric.h"

diff --git a/gpsbabel/magproto.cc b/gpsbabel/magproto.cc
index 52dff2d3ece7f157e239cc7cd95862e823274895..7b56c3b5c51476d76268a4335037c7d3522ba8e3 100644 (file)
--- a/gpsbabel/magproto.cc
+++ b/gpsbabel/magproto.cc
@@ -21,6 +21,7 @@
  */
 
 #include <ctype.h>
+#include <math.h>
 #include <time.h>
 
 #include "defs.h"

diff --git a/gpsbabel/mtk_logger.cc b/gpsbabel/mtk_logger.cc
index f2bb214a483acaf01ce4d4168a0398562587801c..fd2ff099dec5d22b2c2592c9f646b5761bc011cc 100644 (file)
--- a/gpsbabel/mtk_logger.cc
+++ b/gpsbabel/mtk_logger.cc
@@ -52,11 +52,13 @@
 
  */
 
+#include <ctype.h>
+#include <errno.h>
+#include <math.h>
+
 #include "defs.h"
 #include "gbser.h"
 #include "gbfile.h" /* used for csv output */
-#include <ctype.h>
-#include <errno.h>
 
 #define MYNAME "mtk_logger"
 

diff --git a/gpsbabel/nmea.cc b/gpsbabel/nmea.cc
index 5412a01e398a8d9bdd520954a1e164834b35f5ae..1584f4bd782335cdb765d615854920168b244771 100644 (file)
--- a/gpsbabel/nmea.cc
+++ b/gpsbabel/nmea.cc
@@ -21,6 +21,7 @@
  */
 
 #include <ctype.h>
+#include <math.h>
 #include <time.h>
 
 #include "defs.h"

diff --git a/gpsbabel/overlay.cc b/gpsbabel/overlay.cc
index 905b20d6096cf2f8ed9f6825846da2c5b1b0f525..5426ff36567f6a7b1ddc69e457960b66e5aae5a5 100644 (file)
--- a/gpsbabel/overlay.cc
+++ b/gpsbabel/overlay.cc
@@ -25,6 +25,9 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
+
+#include <math.h>
+
 #include "defs.h"
 #include "grtcirc.h"
 

diff --git a/gpsbabel/palmdoc.cc b/gpsbabel/palmdoc.cc
index 40497956694706650a7b40b6cc73ad201046c36d..8e3d656cda24d5feba984b8dbb4b19ce06b24235 100644 (file)
--- a/gpsbabel/palmdoc.cc
+++ b/gpsbabel/palmdoc.cc
@@ -22,10 +22,12 @@
 */
 
 
+#include <ctype.h>
+#include <math.h>
+
 #include "defs.h"
 #if PDBFMTS_ENABLED
 #include "jeeps/gpsmath.h"
-#include <ctype.h>
 #include "pdbfile.h"
 
 static pdbfile *file_out;

diff --git a/gpsbabel/parse.cc b/gpsbabel/parse.cc
index 3167bdaef5b61f30749fc5b63cd4659f2cc19b3e..2453f1323d6129608ed0e93b682595609eaf86b3 100644 (file)
--- a/gpsbabel/parse.cc
+++ b/gpsbabel/parse.cc
@@ -20,10 +20,11 @@
 
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 
 #include "defs.h"

diff --git a/gpsbabel/pathaway.cc b/gpsbabel/pathaway.cc
index f982fa18e2968d27dc96e83e7a2569acba54c2d0..914b75d6ffd8ba04096cf5015a037cefbbe4d8c2 100644 (file)
--- a/gpsbabel/pathaway.cc
+++ b/gpsbabel/pathaway.cc
@@ -48,7 +48,10 @@
 
 */
 
+
 #include <ctype.h>
+#include <math.h>
+
 #include "defs.h"
 #if PDBFMTS_ENABLED
 #include "csv_util.h"

diff --git a/gpsbabel/pcx.cc b/gpsbabel/pcx.cc
index 0f5ca968bb000f67a98839d951416910b34ac74d..979f21d8cb98166ae3182d4a213c70423239ceda 100644 (file)
--- a/gpsbabel/pcx.cc
+++ b/gpsbabel/pcx.cc
@@ -19,11 +19,12 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 */
 
+#include <ctype.h>
+#include <math.h>
 
 #include "defs.h"
 #include "garmin_tables.h"
 #include "csv_util.h"
-#include <ctype.h>
 
 static gbfile *file_in, *file_out;
 static short_handle mkshort_handle;

diff --git a/gpsbabel/position.cc b/gpsbabel/position.cc
index 76503cc46ac1719f3a7b343844fcd335041f5ef7..95793dde4857561724e5c033958a60978793fa2c 100644 (file)
--- a/gpsbabel/position.cc
+++ b/gpsbabel/position.cc
@@ -18,6 +18,8 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
+#include <math.h>
+
 #include "defs.h"
 #include "filterdefs.h"
 #include "grtcirc.h"

diff --git a/gpsbabel/skyforce.cc b/gpsbabel/skyforce.cc
index 8b2550387cba8cb122ee0602f2dd61ad47d8b007..10588614894f9ec935fe7c2f74e1f2ce7c41ce00 100644 (file)
--- a/gpsbabel/skyforce.cc
+++ b/gpsbabel/skyforce.cc
@@ -21,11 +21,12 @@
  */
 
 
-#include "defs.h"
 #include <ctype.h>
+#include <math.h>
 #include <time.h>
-#include "strptime.h"
 
+#include "defs.h"
+#include "strptime.h"
 
 #define MYNAME "skyforce"
 

diff --git a/gpsbabel/skytraq.cc b/gpsbabel/skytraq.cc
index 465eaa2bcc576793c0f4216c47336d747466a416..05f1fe926c5d8a0ef3938137644f6c7050ddcc7a 100644 (file)
--- a/gpsbabel/skytraq.cc
+++ b/gpsbabel/skytraq.cc
@@ -24,10 +24,10 @@
  */
 
 #include <ctype.h>
+#include <math.h>
 
 #include "defs.h"
 #include "gbser.h"
-//#include "jeeps/gpsmath.h"
 
 #define MYNAME "skytraq"
 

diff --git a/gpsbabel/tiger.cc b/gpsbabel/tiger.cc
index 7ceb90d32ad95b4a1aa894b22af4f609827cacdc..8749c1ffed4e7a1044ab4de7e121457e2f7687f2 100644 (file)
--- a/gpsbabel/tiger.cc
+++ b/gpsbabel/tiger.cc
@@ -19,6 +19,8 @@
 
  */
 
+#include <math.h>
+
 #include "defs.h"
 #include "csv_util.h"
 

diff --git a/gpsbabel/tpo.cc b/gpsbabel/tpo.cc
index b76a341ef9dc2848fb3e60b1b6792f703f76cebf..a3638f0bf4c845881e14470e97e31c4b1eb1f053 100644 (file)
--- a/gpsbabel/tpo.cc
+++ b/gpsbabel/tpo.cc
@@ -70,9 +70,11 @@
     3.x     "recreation"
 */
 
-#include "defs.h"
-#include <string.h>
 #include <ctype.h>
+#include <math.h>
+#include <string.h>
+
+#include "defs.h"
 #include "jeeps/gpsmath.h" /* for datum conversions */
 
 #define MYNAME "TPO"

diff --git a/gpsbabel/trackfilter.cc b/gpsbabel/trackfilter.cc
index b01a36cfa92ea03d95ba824e450bf68ba6bf685b..5bcdfcc01b0c5254d0bd10671fd49454bc38b17f 100644 (file)
--- a/gpsbabel/trackfilter.cc
+++ b/gpsbabel/trackfilter.cc
@@ -38,6 +38,8 @@
 */
 
 #include <ctype.h>
+#include <math.h>
+
 #include "defs.h"
 #include "filterdefs.h"
 #include "strptime.h"

diff --git a/gpsbabel/unicsv.cc b/gpsbabel/unicsv.cc
index df804d2cdf2ac1c917bd497d88d6e4744af7d10b..f9da2f0feade398f5bb335d749c8c8d28854bd73 100644 (file)
--- a/gpsbabel/unicsv.cc
+++ b/gpsbabel/unicsv.cc
@@ -19,6 +19,10 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 */
 
+#include <math.h>
+#include <string.h>
+#include <time.h>
+
 #include "defs.h"
 #include "cet.h"
 #include "cet_util.h"
@@ -26,8 +30,6 @@
 #include "garmin_fs.h"
 #include "garmin_tables.h"
 #include "jeeps/gpsmath.h"
-#include <string.h>
-#include <time.h>
 
 #define MYNAME "unicsv"
 

diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc
index 8088a6c0f6cb2f8fc698c64d29ceef0984e2d6be..998446fbe9a2b3103894e1da1e6efd0b8d64b856 100644 (file)
--- a/gpsbabel/util.cc
+++ b/gpsbabel/util.cc
@@ -22,11 +22,12 @@
 #include "defs.h"
 #include "jeeps/gpsmath.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
+#include <math.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 
 // First test Apple's clever macro that's really a runtime test so

diff --git a/gpsbabel/vcf.cc b/gpsbabel/vcf.cc
index 9c76a6359584fa491eccdc3efc136aa39f474517..1070bba5a5b67fb9be1225585d3319a61bd2ec45 100644 (file)
--- a/gpsbabel/vcf.cc
+++ b/gpsbabel/vcf.cc
@@ -19,9 +19,11 @@
 */
 
 
+#include <ctype.h>
+#include <math.h>
+
 #include "defs.h"
 #include "jeeps/gpsmath.h"
-#include <ctype.h>
 
 static gbfile *file_out;
 static short_handle mkshort_handle;

diff --git a/gpsbabel/vitosmt.cc b/gpsbabel/vitosmt.cc
index 72f365aec9c5ab6103812a99b078275c9709fcb8..0fbbd89eed4f3f758d3d51eabbda121e180ab1ba 100644 (file)
--- a/gpsbabel/vitosmt.cc
+++ b/gpsbabel/vitosmt.cc
@@ -19,10 +19,11 @@
 
  */
 
+#include <errno.h>
+#include <math.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 #define MYNAME "vitosmt"
 #include "defs.h"

diff --git a/gpsbabel/waypt.cc b/gpsbabel/waypt.cc
index 6dbfaa3a7756e41d90c699910a66bb138bdcfc1d..4df831532c44e537d51a9d02119db13db297ecf0 100644 (file)
--- a/gpsbabel/waypt.cc
+++ b/gpsbabel/waypt.cc
@@ -20,6 +20,8 @@
  */
 
 #include <stdio.h>
+#include <math.h>
+
 #include "defs.h"
 #include "cet_util.h"
 #include "grtcirc.h"